From: Erik Bernhardson <ebernhardson@wikimedia.org>
Date: Fri, 8 Jun 2018 21:46:03 +0000 (-0700)
Subject: Resolve required parameter after optional in language
X-Git-Tag: 1.34.0-rc.0~5136^2
X-Git-Url: http://git.cyclocoop.org//%22http:/%22.attribut_html%28%24lesurls%5B%24numero%5D%29.%22/%22?a=commitdiff_plain;h=764f5c7a02fbc02d829bad1ffa3d20aaea51095f;p=lhc%2Fweb%2Fwiklou.git

Resolve required parameter after optional in language

Change-Id: I6e0c3b14f1bcea112be7ab694efff5a67622d637
---

diff --git a/languages/Language.php b/languages/Language.php
index da7bc94b21..321d5f895a 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -3554,7 +3554,7 @@ class Language {
 	 * @return string
 	 */
 	private function truncateInternal(
-		$string, $length, $ellipsis = '...', $adjustLength = true, $measureLength, $getSubstring
+		$string, $length, $ellipsis, $adjustLength, $measureLength, $getSubstring
 	) {
 		if ( !is_callable( $measureLength ) || !is_callable( $getSubstring ) ) {
 			throw new InvalidArgumentException( 'Invalid callback provided' );
@@ -4471,7 +4471,7 @@ class Language {
 	 * @throws MWException
 	 * @return string $prefix . $mangledCode . $suffix
 	 */
-	public static function getFileName( $prefix = 'Language', $code, $suffix = '.php' ) {
+	public static function getFileName( $prefix, $code, $suffix = '.php' ) {
 		if ( !self::isValidBuiltInCode( $code ) ) {
 			throw new MWException( "Invalid language code \"$code\"" );
 		}